Skip to content

[qscintilla] update version to 2.13.4#30158

Merged
dan-shaw merged 1 commit intomicrosoft:masterfrom
MehdiChinoune:qscintilla-update
Mar 20, 2023
Merged

[qscintilla] update version to 2.13.4#30158
dan-shaw merged 1 commit intomicrosoft:masterfrom
MehdiChinoune:qscintilla-update

Conversation

@MehdiChinoune
Copy link
Contributor

@MehdiChinoune MehdiChinoune commented Mar 13, 2023

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

FrankXie05
FrankXie05 suggested changes Mar 14, 2023
View reviewed changes
@FrankXie05 FrankXie05 added category:port-update The issue is with a library, which is requesting update new revision requires:author-response labels Mar 14, 2023
@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 14, 2023

I don't have an osx machine to test building.

@dg0yt
Copy link
Contributor

dg0yt commented Mar 14, 2023

CI builds osx:

clang: error: invalid version number in '-mmacosx-version-min='
clang: error: invalid deployment target for -stdlib=libc++ (requires OS X 10.7 or later)

If this relies on VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET from port vcpkg-cmake-get-vars, then there is a chance that this is fixed by the corrections contained in #29966.

@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 15, 2023

If this relies on VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET from port vcpkg-cmake-get-vars, then there is a chance that this is fixed by the corrections contained in #29966.

I have rebased my changes after the above PR were merged, but still fails on osx.

@FrankXie05
Copy link
Contributor

FrankXie05 commented Mar 15, 2023

Need to merge master.

@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 15, 2023

Need to merge master.

What do you mean, I have rebased my branch on upstream/master

@dg0yt
Copy link
Contributor

dg0yt commented Mar 15, 2023

The CI build is for a merge commit, so it really includes #29966.
The logs still show set(VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET "").

@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 16, 2023

Should osx be disabled! ("supports": "!osx",)

@dg0yt
Copy link
Contributor

dg0yt commented Mar 17, 2023

No, you should fix osx properly.

@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 17, 2023 •
edited
Loading

No, you should fix osx properly.

I don't have a machine with that OS, It's not Windows or Linux.

@MehdiChinoune MehdiChinoune marked this pull request as ready for review March 19, 2023 19:03
@MehdiChinoune
Copy link
Contributor Author

MehdiChinoune commented Mar 19, 2023

It should be ready now (Qt5)

@FrankXie05 FrankXie05 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Mar 20, 2023
@FrankXie05 FrankXie05 changed the title qscintilla: update to 2.13.4 [qscintilla] update version to 2.13.4 Mar 20, 2023
@dan-shaw dan-shaw merged commit 58cf7ef into microsoft:master Mar 20, 2023
@MehdiChinoune MehdiChinoune deleted the qscintilla-update branch March 20, 2023 07:10
@MehdiChinoune MehdiChinoune mentioned this pull request Mar 22, 2023
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@FrankXie05 FrankXie05 FrankXie05 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@FrankXie05 FrankXie05

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MehdiChinoune @dg0yt @FrankXie05 @dan-shaw